Merge "Refactor one handed displayArea working flow"