Merge proposals dependent on lp://qastaging/~azzar1/nautilus/backport_21_correct_timestamp_use_fix_focus_issue

1. backport_21_correct_timestamp_use_fix_focus_issue
2. Dependent merge proposals