Merge "Update task bar height update logic to consider screen rotation cases" into main