Add timestamp to recent panels and font test for xs screens
Fix merge conflict step 1
Rebuild after conflict resolve